fix logic (fixes #74235, #73593)

Thu Mar 21 00:05:14 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeview.c (gtk_tree_view_get_background_area),
        (gtk_tree_view_get_cell_area): fix logic (fixes #74235, #73593)

diff --git a/ChangeLog b/ChangeLog
index 0fe9234dd1d864f7b28abdeca3305868ef59a7ca..e7af3fe62de6fa1321d04f92b811f5b971c8d8b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 21 00:05:14 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_background_area),
+       (gtk_tree_view_get_cell_area): fix logic (fixes #74235, #73593)
+
 Wed Mar 20 17:11:51 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c: Patch from Richard Hestilow to fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0fe9234dd1d864f7b28abdeca3305868ef59a7ca..e7af3fe62de6fa1321d04f92b811f5b971c8d8b6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Mar 21 00:05:14 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_background_area),
+       (gtk_tree_view_get_cell_area): fix logic (fixes #74235, #73593)
+
 Wed Mar 20 17:11:51 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c: Patch from Richard Hestilow to fix

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0fe9234dd1d864f7b28abdeca3305868ef59a7ca..e7af3fe62de6fa1321d04f92b811f5b971c8d8b6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Mar 21 00:05:14 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_background_area),
+       (gtk_tree_view_get_cell_area): fix logic (fixes #74235, #73593)
+
 Wed Mar 20 17:11:51 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c: Patch from Richard Hestilow to fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0fe9234dd1d864f7b28abdeca3305868ef59a7ca..e7af3fe62de6fa1321d04f92b811f5b971c8d8b6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Mar 21 00:05:14 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_background_area),
+       (gtk_tree_view_get_cell_area): fix logic (fixes #74235, #73593)
+
 Wed Mar 20 17:11:51 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c: Patch from Richard Hestilow to fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0fe9234dd1d864f7b28abdeca3305868ef59a7ca..e7af3fe62de6fa1321d04f92b811f5b971c8d8b6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Mar 21 00:05:14 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_background_area),
+       (gtk_tree_view_get_cell_area): fix logic (fixes #74235, #73593)
+
 Wed Mar 20 17:11:51 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c: Patch from Richard Hestilow to fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0fe9234dd1d864f7b28abdeca3305868ef59a7ca..e7af3fe62de6fa1321d04f92b811f5b971c8d8b6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Mar 21 00:05:14 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_background_area),
+       (gtk_tree_view_get_cell_area): fix logic (fixes #74235, #73593)
+
 Wed Mar 20 17:11:51 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkrc.c: Patch from Richard Hestilow to fix

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 955342f1159d63669b0d9b9a0ca40dd3d638d4b3..ed8160e78c932d4bef8bdd2172921eb24487ecf8 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -9335,8 +9335,8 @@ gtk_tree_view_get_cell_area (GtkTreeView        *tree_view,
   if (path)
     {
       /* Get vertical coords */
-      if (_gtk_tree_view_find_node (tree_view, path, &tree, &node) &&
-         tree != NULL)
+      if (!_gtk_tree_view_find_node (tree_view, path, &tree, &node) &&
+         tree == NULL)
        return;
 
       rect->y = CELL_FIRST_PIXEL (tree_view, tree, node, vertical_separator);
@@ -9395,8 +9395,8 @@ gtk_tree_view_get_background_area (GtkTreeView        *tree_view,
     {
       /* Get vertical coords */
 
-      if (_gtk_tree_view_find_node (tree_view, path, &tree, &node) &&
-         tree != NULL)
+      if (!_gtk_tree_view_find_node (tree_view, path, &tree, &node) &&
+         tree == NULL)
        return;
 
       rect->y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);